From 9e4d84f0473e8639c4a5ae7a52bd3dcd6a93bd52 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Mon, 27 Nov 2006 10:08:12 +0000 Subject: [PATCH] [VMXASSIST] Fix the wrong order definition of ES/DS in regs structure. Signed-off-by: Xin Li --- tools/firmware/vmxassist/util.c | 13 +++++++------ tools/firmware/vmxassist/vm86.h | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/firmware/vmxassist/util.c b/tools/firmware/vmxassist/util.c index fbfc79a1a3..6ae4b25f79 100644 --- a/tools/firmware/vmxassist/util.c +++ b/tools/firmware/vmxassist/util.c @@ -62,14 +62,15 @@ dump_regs(struct regs *regs) regs->eax, regs->ecx, regs->edx, regs->ebx); printf("esp %8x ebp %8x esi %8x edi %8x\n", regs->esp, regs->ebp, regs->esi, regs->edi); - printf("eip %8x eflags %8x cs %8x ds %8x\n", - regs->eip, regs->eflags, regs->cs, regs->ds); - printf("es %8x fs %8x uss %8x uesp %8x\n", - regs->es, regs->fs, regs->uss, regs->uesp); + printf("es %8x ds %8x fs %8x gs %8x\n", + regs->es, regs->ds, regs->fs, regs->gs); + printf("trapno %8x errno %8x\n", regs->trapno, regs->errno); + printf("eip %8x cs %8x eflags %8x\n", + regs->eip, regs->cs, regs->eflags); + printf("uesp %8x uss %8x \n", + regs->uesp, regs->uss); printf("ves %8x vds %8x vfs %8x vgs %8x\n", regs->ves, regs->vds, regs->vfs, regs->vgs); - if (regs->trapno != -1 || regs->errno != -1) - printf("trapno %8x errno %8x\n", regs->trapno, regs->errno); printf("cr0 %8lx cr2 %8x cr3 %8lx cr4 %8lx\n", (long)oldctx.cr0, get_cr2(), diff --git a/tools/firmware/vmxassist/vm86.h b/tools/firmware/vmxassist/vm86.h index 0c04dc6e73..4c6609daf0 100644 --- a/tools/firmware/vmxassist/vm86.h +++ b/tools/firmware/vmxassist/vm86.h @@ -33,11 +33,11 @@ #ifndef __ASSEMBLY__ struct regs { - unsigned edi, esi, ebp, esp, ebx, edx, ecx, eax; - unsigned ds, es, fs, gs; - unsigned trapno, errno; - unsigned eip, cs, eflags, uesp, uss; - unsigned ves, vds, vfs, vgs; + unsigned edi, esi, ebp, esp, ebx, edx, ecx, eax; + unsigned es, ds, fs, gs; + unsigned trapno, errno; + unsigned eip, cs, eflags, uesp, uss; + unsigned ves, vds, vfs, vgs; }; enum vm86_mode { -- 2.30.2